Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 1 Mar 2007 11:04:45 +0000 (11:04 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 1 Mar 2007 11:04:45 +0000 (11:04 +0000)

Trivial merge